Removed raw references to __APPLE__; now just check to see if it is defined. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@177297 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/__locale b/include/__locale index 1c093f6..6f6a97b 100644 --- a/include/__locale +++ b/include/__locale
@@ -21,7 +21,7 @@ #include <locale.h> #ifdef _WIN32 # include <support/win32/locale_win32.h> -#elif (__GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__) +#elif (__GLIBC__ || defined(__APPLE__) || __FreeBSD__ || __sun__) # include <xlocale.h> #endif // _WIN32 || __GLIBC__ || __APPLE__ || __FreeBSD_
diff --git a/include/iterator b/include/iterator index 59e3390..3b078a2 100644 --- a/include/iterator +++ b/include/iterator
@@ -317,7 +317,7 @@ #include <type_traits> #include <cstddef> #include <iosfwd> -#if __APPLE__ +#ifdef __APPLE__ #include <Availability.h> #endif
diff --git a/include/locale b/include/locale index a6f2e35..0d8fba0 100644 --- a/include/locale +++ b/include/locale
@@ -181,7 +181,7 @@ #include <streambuf> #include <iterator> #include <limits> -#if !__APPLE__ +#ifndef __APPLE__ #include <cstdarg> #endif #include <cstdlib> @@ -192,7 +192,7 @@ #include <nl_types.h> #endif // !_WIN32 -#if __APPLE__ +#ifdef __APPLE__ #include <Availability.h> #endif @@ -204,7 +204,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __APPLE__ || __FreeBSD__ +#if defined(__APPLE__) || __FreeBSD__ # define _LIBCPP_GET_C_LOCALE 0 #else # define _LIBCPP_GET_C_LOCALE __cloc()
diff --git a/src/chrono.cpp b/src/chrono.cpp index 1ce2e28..15a6f46 100644 --- a/src/chrono.cpp +++ b/src/chrono.cpp
@@ -9,7 +9,7 @@ #include "chrono" #include <sys/time.h> //for gettimeofday and timeval -#if __APPLE__ +#ifdef __APPLE__ #include <mach/mach_time.h> // mach_absolute_time, mach_timebase_info_data_t #else /* !__APPLE__ */ #include <cerrno> // errno @@ -50,7 +50,7 @@ const bool steady_clock::is_steady; -#if __APPLE__ +#ifdef __APPLE__ // mach_absolute_time() * MachInfo.numer / MachInfo.denom is the number of // nanoseconds since the computer booted up. MachInfo.numer and MachInfo.denom // are run time constants supplied by the OS. This clock has no relationship
diff --git a/src/exception.cpp b/src/exception.cpp index 0cd182b..7db304d 100644 --- a/src/exception.cpp +++ b/src/exception.cpp
@@ -14,7 +14,7 @@ #define __has_include(inc) 0 #endif -#if __APPLE__ +#ifdef __APPLE__ #include <cxxabi.h> using namespace __cxxabiv1; @@ -102,7 +102,7 @@ #if !defined(LIBCXXRT) && !defined(__GLIBCXX__) bool uncaught_exception() _NOEXCEPT { -#if __APPLE__ || defined(_LIBCPPABI_VERSION) +#if defined(__APPLE__) || defined(_LIBCPPABI_VERSION) // on Darwin, there is a helper function so __cxa_get_globals is private return __cxa_uncaught_exception(); #else // __APPLE__ diff --git a/src/new.cpp b/src/new.cpp index 3ad593a..b23a516 100644 --- a/src/new.cpp +++ b/src/new.cpp
@@ -15,7 +15,7 @@ #define __has_include(inc) 0 #endif -#if __APPLE__ +#ifdef __APPLE__ #include <cxxabi.h> #ifndef _LIBCPPABI_VERSION
diff --git a/src/stdexcept.cpp b/src/stdexcept.cpp index 660ebfe..0c4e832 100644 --- a/src/stdexcept.cpp +++ b/src/stdexcept.cpp
@@ -20,7 +20,7 @@ #define __has_include(inc) 0 #endif -#if __APPLE__ +#ifdef __APPLE__ #include <cxxabi.h> #elif defined(LIBCXXRT) || __has_include(<cxxabi.h>) #include <cxxabi.h>
diff --git a/src/typeinfo.cpp b/src/typeinfo.cpp index 6bab077..7b47d74 100644 --- a/src/typeinfo.cpp +++ b/src/typeinfo.cpp
@@ -12,7 +12,7 @@ #define __has_include(inc) 0 #endif -#if __APPLE__ +#ifdef __APPLE__ #include <cxxabi.h> #elif defined(LIBCXXRT) || __has_include(<cxxabi.h>) #include <cxxabi.h> @@ -50,7 +50,7 @@ return "std::bad_typeid"; } -#if __APPLE__ +#ifdef __APPLE__ // On Darwin, the cxa_bad_* functions cannot be in the lower level library // because bad_cast and bad_typeid are defined in his higher level library void __cxxabiv1::__cxa_bad_typeid() { throw std::bad_typeid(); } diff --git a/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp b/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp index 7da56bb..2010dca 100644 --- a/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp +++ b/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
@@ -24413,7 +24413,7 @@ output_iterator<char*> iter; std::locale lc = std::locale::classic(); std::locale lg(lc, new my_numpunct); -#if __APPLE__ +#ifdef __APPLE__ // This test is failing on FreeBSD, possibly due to different representations // of the floating point numbers. const my_facet f(1);
diff --git a/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp b/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp index 6d58337..973d374 100644 --- a/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp +++ b/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
@@ -93,7 +93,7 @@ assert(t.tm_hour == 23); assert(err == std::ios_base::eofbit); } -#if __APPLE__ +#ifdef __APPLE__ { const my_facet f("ru_RU", 1); const wchar_t in[] = L"\x441\x443\x431\x431\x43E\x442\x430" @@ -128,7 +128,7 @@ assert(t.tm_hour == 23); assert(err == std::ios_base::eofbit); } -#if __APPLE__ +#ifdef __APPLE__ { const my_facet f("zh_CN", 1); const wchar_t in[] = L"\x516D" 